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

No content change.

Bug: 135460123
Change-Id: I54f2ee57c3771eadff886575952af9297cda4925
Merged-In: Ifc7ee33566c7e709449a7ce9c76365346243f949
tree: 20474a7f4d7d678a8c10e0537d636ce551ef06a0
  1. bootstrap/
  2. linux-x86/