[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 2afda455c2
am: 848b54cabd -s ours
am skip reason: subject contains skip directive

Change-Id: I65f9a98ecdba8479823fdde0c11992866fb43153
tree: 2b5837b769528abd1ae14740282bd1260cdfa55f
  1. bootctrl/
  2. libhwcomposer/
  3. Android.bp
  4. OWNERS