Merge cb9ba55363a959d6dd9afd99fe4038ba4ba33432 on remote branch

Change-Id: I7cb2071b3aae7887d52c4b76df70f2860a5cdc2c
tree: deb111efd839fa0d60f6895f97a927998e3f0bae
  1. art/
  2. hwbinder/
  3. hwui/
  4. scripts/
  5. .gitignore
  6. OWNERS