DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master

Bug: 151763422
Change-Id: I69b76603053fa88c407d2401a9738cac216432e4
tree: 7d4d6ba3dee0f4aaa9b30e5c542526eb34771aa3
  1. Android.bp
  2. CleanSpec.mk
  3. src/