DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: ea3b50b135

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