DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master

Bug: 146167222
Change-Id: Ide5f46ad3b14e358ee171e5783010e38bdcdc5d5
tree: 8c28436d38781bedb42070f16f4609a59ebc8c0b
  1. src/
  2. Android.bp
  3. CleanSpec.mk