[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.
am: 4d0432b5b2 -s ours
am skip reason: subject contains skip directive

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