DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: e080347d68

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