Merge 6d41ae861c0d7f4bb2a117e04cbf44d82551da58 on remote branch

Change-Id: I080933be9de74762feda789ce2084f7aaec2bc3c
tree: c114ab3b85a0b94606f584a2a6fa0c72f670bfe9
  1. 1.1/
  2. 1.2/
  3. extns/
  4. halimpl/
  5. Android.bp
  6. OWNERS