Merge 43e3bdd3e107d26a683cb638fac08413588c2637 on remote branch

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