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

Change-Id: I5e715654a1c1915f84fd8ddb6a4c1e083cf69f07
tree: e8be7c8cd0be7ad6509e2295e60f9ed24da20a1c
  1. bootstrap/
  2. darwin-x86/
  3. linux-x86/