DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: caecaafc59

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