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

Change-Id: Id03a7f7b60661a936f873c223e30c074a4b21cbf
tree: e89f35503b253ac18431615ea2d04c31c6231708
  1. arm/
  2. arm64/
  3. common/
  4. x86/
  5. x86_64/
  6. Android.bp