DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

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