Merge stage-aosp-master into pi-dev-plus-aosp
am: 1522ec5c3b

Change-Id: I4b70b4db9dabdeac09cd58befa856f8d9a9f0d3e
tree: d1e8bdef4446f870d4e22d6d0582f6b6edc708b4
  1. hal/
  2. ipacm/
  3. ipanat/
  4. configure.ac
  5. Makefile.am
  6. os_pickup.bp
  7. os_pickup.mk