[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: a5efd51e5b
am: 05eee3720e -s ours
am skip reason: subject contains skip directive

Change-Id: I157de1361de02f2a533c308254a0635fc4830599
tree: 0c0ecdf5b587c2a1c80cfed8d40c5aab3c0d7f46
  1. Android.bp
  2. src/