AAP57
Put ANDROID_BUILD_PATHS before the system default PATH

So tools like adb that are built from source won't be overridden by the
host system tools, when you run these tools without specifying the path.

Change-Id: I2f0a288b38fabf57c7a4aa3bae5e42d7b734398d
merge in master-release history after reset to master
AAP58
Merge jb-mr1-dev into aosp/master - do not merge

Change-Id: Icf16741de4c0d248e5ffe3ef3b31ce6ce51c4c9f
am a2314e43: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge

* commit 'a2314e433e3383b6fdaff6dedac1b314c494cd09':
am 76828ed6: (-s ours) am a2314e43: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge

* commit '76828ed64585c20023dd998eb53ec083d5996713':
Run e2fsck on built sparse images.

Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
Merge "Put ANDROID_BUILD_PATHS before the system default PATH"
Merge "Run e2fsck on built sparse images."
Use the correct size key

At this point, userdata_size has been converted to partition_size in
build_image.ImagePropFromGlobalDict().

Change-Id: Ida6be1905ca3109c2660274a16359a9f3fbcd94d
am 257fef43: Reconcile with jb-mr1-release - do not merge

* commit '257fef430806408dbaca2708018b144d430fbdef':
  bump version to 4.2.1
  JOP40D
am d4f8d5e6: replace dummy versions with normal ones for mini

* commit 'd4f8d5e64950eb114993a9de975e1519e3509d43':
  replace dummy versions with normal ones for mini
am c361ae56: am 257fef43: Reconcile with jb-mr1-release - do not merge

* commit 'c361ae56dc7f3909cb9c1adb2af2602bd0428c7b':
  bump version to 4.2.1
  JOP40D
am 490d3f24: am d4f8d5e6: replace dummy versions with normal ones for mini

* commit '490d3f24fce962c4cb98b1517f0ef1056906d587':
  replace dummy versions with normal ones for mini
am f44a518c: am c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH

* commit 'f44a518c104b706c752b671b0308716c7cca73d5':
  Put ANDROID_BUILD_PATHS before the system default PATH
am caee64a9: am f44a518c: am c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH

* commit 'caee64a98ac6f7f88888e2105ca07da17bb6311b':
  Put ANDROID_BUILD_PATHS before the system default PATH
am 1aace7da: am 502c939f: docs: add support for an infinite number of nested lists in side nav

* commit '1aace7da06b4f9d4c5024a18accf99b2e4be0fb3':
  docs: add support for an infinite number of nested lists in side nav
am 0a7c8e2b: am 1aace7da: am 502c939f: docs: add support for an infinite number of nested lists in side nav

* commit '0a7c8e2be18dc4ee4b2093538793948601e40b0a':
  docs: add support for an infinite number of nested lists in side nav
am 127c69da: (-s ours) am c361ae56: am 257fef43: Reconcile with jb-mr1-release - do not merge

* commit '127c69da094ddd8057e5a50b08e48286f06b2d3b':
  bump version to 4.2.1
  JOP40D