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

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