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

Change-Id: Id417f1be7aeda67de37c4202db893b0cf430f39f
tree: ac2d8272b06e7e9f57785c5d404fe41da8533223
  1. src/
  2. Android.bp
  3. CleanSpec.mk