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

am skip reason: subject contains skip directive

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