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

Change-Id: I3ae57c9fc8f972815be41d6c8851ece64d958d01
tree: 71c79ea264ae9ad21823b08674f61ed8f0e54350
  1. src/
  2. Android.bp
  3. CleanSpec.mk