[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: d507036def -s ours am: 6bcafd8992 am: 0ad16a22ac

Change-Id: Ia033dfedc6beab1c879137b374cfea3d45a33686
tree: 9e55f209b01d764244f7910d3b322302c8d7df67
  1. Android.bp
  2. CleanSpec.mk
  3. src/