[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: 74a971a76f  -s ours
am: 671bf751dd  -s ours

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