Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

No content change.

Bug: 135460123
Change-Id: Ifec3f5a15e81acb666832ec1f4bce489d94496bb
Merged-In: I11cfa3cc9f37b09928e88b23146c837d65e0475d
tree: 55199614bc58cb28e88c67295c3bb4673e4f1db6
  1. src/
  2. Android.bp
  3. CleanSpec.mk