Merge 740de3132ee27f885d1daac41e33a88fdfbf8ad8 on remote branch

Change-Id: Ib84075aaf1febec7fefa85a00ea7903711d0b625
tree: 96ac3b3fefd0ea0bb45e68cb326f802f361d1c7f
  1. art/
  2. hwbinder/
  3. hwui/
  4. scripts/
  5. .gitignore
  6. OWNERS