Merge 0ff8d48c68cb42c0976ec3f17d73a4e1eddb10ff on remote branch

Change-Id: I13a94459fd9e43c9e8a02592b621196fbcec7c28
tree: f313e799c4e2737fe4c3f0e33bbeff02c2c9d508
  1. bootctrl/
  2. libhwcomposer/
  3. Android.bp
  4. METADATA
  5. OWNERS