[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: 89c726ecaf  -s ours

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