Merge d5c171b12ddbaf89dfd4c581a8b915c95112510d on remote branch

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