[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: ea3b50b135
am: a82a6f86c4 -s ours
am skip reason: subject contains skip directive

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