Merge 2cf8a32bd5ef9d3afb3ed625499499bb1d889c1d on remote branch

Change-Id: I2a067629dd9fffd50e7f79312280532bcc11059e
tree: 292410bc4f0a236b7d254fc0635c14dd02d22250
  1. art/
  2. hwbinder/
  3. hwui/
  4. scripts/
  5. .gitignore
  6. OWNERS