Merge stage-aosp-master into pi-dev-plus-aosp

Bug: 126125118
Change-Id: Ia35cd146203060870fd75c484eda33b5f214f548
tree: 0450c908bb23bd5c9f8a9574be92f82dfe89499b
  1. hal/
  2. ipacm/
  3. ipanat/
  4. configure.ac
  5. Makefile.am
  6. os_pickup.bp
  7. os_pickup.mk