[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: 8c4f391b0b -s ours am: 4a3c3da859 am: 287414310d

Change-Id: I96c4de242f4cdf3ca8026589edd1c9dd3ff9bf3a
tree: 09e8e6b1a627e1748be4ce1a8fdbecdaa2969a61
  1. Android.bp
  2. CleanSpec.mk
  3. src/