[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 9a54b299c6 -s ours am: a25d8b0667

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