DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master

Bug: 151763422
Change-Id: I3fe0fb7edd301e00d49dc9a72dd80269f671df24
tree: e406a02f4dafdf6f2c025ba7155d399325216712
  1. Android.bp
  2. CleanSpec.mk
  3. src/