[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 6e4a19b7c7 -s ours am: 641b4ae126 -s ours
am: f501b9adbf -s ours
am skip reason: change_id I11cfa3cc9f37b09928e88b23146c837d65e0475d with SHA1 d5ebd7adbb is in history

Change-Id: If5c889110d070ff97b29ab5cb3c9be358058d0c9
tree: 55199614bc58cb28e88c67295c3bb4673e4f1db6
  1. src/
  2. Android.bp
  3. CleanSpec.mk