Merge 0cbf93ee640b345104faa2ad10c87390438b5555 on remote branch

Change-Id: I6fd030ea7a0626d2bb405c7e6d70e5b02031b58a
tree: 0903338764a010c00988aad0d203d79ab690fe9b
  1. art/
  2. hwbinder/
  3. hwui/
  4. scripts/
  5. .gitignore
  6. OWNERS