Merge 096e5fe3578d01f8bf48c96984b51ac5d0bfb78e on remote branch

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