am ce40d5f9: am bc7501e1: Merge "More consistent use of 64-bit build variable."

* commit 'ce40d5f99e9c0658aab9539bf8afa253dfd985e4':
  More consistent use of 64-bit build variable.
am 8a749606: am 02a5b517: Merge "Make dex2oat heap size product configurable [build]"

* commit '8a7496060df85c241b976d6cd69b13828e452ef9':
  Make dex2oat heap size product configurable [build]
am 042c8a06: (-s ours) am f0200e87: am 72146221: am 0b3aa00e: am da111964: (-s ours) am d23dcdf1: am a0130a4d: am 9915a60c: (-s ours) am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]

* commit '042c8a06c1fce45856d49ae73c06f1eb7043669f':
  Integrate build_font.py [DO NOT MERGE]
am d3b5d574: am ce40d5f9: am bc7501e1: Merge "More consistent use of 64-bit build variable."

* commit 'd3b5d574defd565d6e810cbb86e3943837f94065':
  More consistent use of 64-bit build variable.
am ef0b6e0c: am 8a749606: am 02a5b517: Merge "Make dex2oat heap size product configurable [build]"

* commit 'ef0b6e0c19eb37f4fbc42491771611e247168519':
  Make dex2oat heap size product configurable [build]
am c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."

* commit 'c35cc93d3b12880ae4de00ae9ef867ab91dbc412':
  Allow symlinks to device or vendor tree in envsetup.sh.
am c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"

* commit 'c4954f392e94f1877ab77ccef725a26c5d549ed1':
  Don't enable LOCAL_DEX_PREOPT for apks outside system.img
am f27e3fb4: am c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."

* commit 'f27e3fb4cf1d51f3abd5261d5626997c71df22b7':
  Allow symlinks to device or vendor tree in envsetup.sh.
am bc3b9801: am c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"

* commit 'bc3b98012dc77474d146db7747c7f33c50fe31c0':
  Don't enable LOCAL_DEX_PREOPT for apks outside system.img
am baad790d: am f27e3fb4: am c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."

* commit 'baad790de671f680d6584edc4712a9cde823f49c':
  Allow symlinks to device or vendor tree in envsetup.sh.
am 094ab99f: am bc3b9801: am c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"

* commit '094ab99f27e68cfb6a39c2355be377e27bd6df72':
  Don't enable LOCAL_DEX_PREOPT for apks outside system.img
Add app to handle captive portal login.

This app is only used if no other app handles the broadcast to perform captive
portal login.

Bug:15409233
Bug:15409354

Change-Id: Ie240d7eac4bdbab8cc7578782bd72d8b26de7951
Merge "Add app to handle captive portal login."
am ec5563b5: Merge "build: fix host dex2oat runtime args"

* commit 'ec5563b55146372fe33ebd4fc13661d811b77323':
  build: fix host dex2oat runtime args
am 50fb938f: am ec5563b5: Merge "build: fix host dex2oat runtime args"

* commit '50fb938f79387ab92ed3b64194da47b146d74db6':
  build: fix host dex2oat runtime args
am 5c75fa65: am 50fb938f: am ec5563b5: Merge "build: fix host dex2oat runtime args"

* commit '5c75fa6561b7b58ae8f024bc6936433242cc9b43':
  build: fix host dex2oat runtime args
Merge "Add support for signed boot images."
Add support for signed boot images.

Change-Id: Ib08fc700f626d838efa9a543316afbcd4b782525
Revert "Add support for signed boot images."

This reverts commit 7e2c5ed84f59c4f19e2baa02733e85006292156e.

Change-Id: Id90e3b2d986fac3ac9b2748194747af712ac4ab1
Merge "Revert "Add support for signed boot images.""