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

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