Misc undefined symbol fixes for Android+LTO.

Misc undefined symbol fixes for Android+LTO.

It appears that at least in some cases, the linker uses a stricter set of
rules when linking LTO objects, which causes the link to fail in some cases
where an unused function depends on an undefined symbol. This change fixes
all such cases where the error caused the LTO build to fail, by either
moving source files between lists, or by selectively disabling parts of
source files depending on the configuration.

There are more errors like this, which for some reason do not affect LTO. They
can be inspected like this (with a regular Chromium/android build):

$ ninja -C out/Release chrome_shell_apk
$ nm out/Release/lib/libchromeshell.so | grep " U _Z"

BUG=407544
R=thakis@chromium.org

Committed: https://crrev.com/3a725956aff76414de8ecec2dcaa773b21fc8fe5
Cr-Commit-Position: refs/heads/master@{#325325}

[Nico, 2015-04-15 16:29:49]

lgtm

https://codereview.chromium.org/1086973003/diff/1/chrome/browser/search/insta...
File chrome/browser/search/instant_service.cc (right):

https://codereview.chromium.org/1086973003/diff/1/chrome/browser/search/insta...
chrome/browser/search/instant_service.cc:23: #endif  // defined(ENABLE_THEMES)
style nit: Move this down (like the !defined(OS_ANDROID) block below). The big
block at the top shouldn't contain conditions as far as I know.

[pcc1, 2015-04-15 21:05:23]

https://codereview.chromium.org/1086973003/diff/1/chrome/browser/search/insta...
File chrome/browser/search/instant_service.cc (right):

https://codereview.chromium.org/1086973003/diff/1/chrome/browser/search/insta...
chrome/browser/search/instant_service.cc:23: #endif  // defined(ENABLE_THEMES)
On 2015/04/15 16:29:49, Nico (away until Wed Apr 15) wrote:
> style nit: Move this down (like the !defined(OS_ANDROID) block below). The big
> block at the top shouldn't contain conditions as far as I know.

Done.

[pcc1, 2015-04-15 21:05:26]

The CQ bit was checked by pcc@chromium.org

[pcc1, 2015-04-15 21:05:27]

The patchset sent to the CQ was uploaded after l-g-t-m from thakis@chromium.org
Link to the patchset: https://codereview.chromium.org/1086973003/#ps20001
(title: "Move #include block down")

[commit-bot: I haz the power, 2015-04-15 21:06:13]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1086973003/20001

[commit-bot: I haz the power, 2015-04-15 22:21:17]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2015-04-15 22:22:32]

Patchset 2 (id:??) landed as
https://crrev.com/3a725956aff76414de8ecec2dcaa773b21fc8fe5
Cr-Commit-Position: refs/heads/master@{#325325}