Merge 4eb9014ff0ad2ace9f2f03437d8c9628b5c25080 on remote branch

Change-Id: I3146259de83c05bd5be055db57dd891ae357331f
tree: 6de86f8424436d36a408ebe99eef281cb8fee771
  1. PMC/
  2. sl4n/
  3. UID/
  4. Android.bp
  5. OWNERS
  6. PREUPLOAD.cfg