[android] Upstream / sync most of build/android and build/android/pylib.

[android] Upstream / sync most of build/android and build/android/pylib.

These files have diverged overtime. We need to get them in sync in
preparation for the instrumentation tests.
The patches downstream have been entangled, so this is a bit big and
contains a series of otherwise unrelated patches.
However, it's probably safer to do this way (as it's guaranteed to be similar to
downstream), than trying to split it in multiple patches.

BUG=
TEST=try -b android_test


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=145872

[felipeg, 2012-07-10 11:20:04]

LGTM
As reviewed in downstream.

[John Knottenbelt, 2012-07-10 11:30:07]

lgtm

[commit-bot: I haz the power, 2012-07-10 11:55:31]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bulach@chromium.org/10689132/1

[commit-bot: I haz the power, 2012-07-10 13:21:44]

Change committed as 145872