Snap for 7481111 from 51ac72fb18162573b4385227df6a68f6a391e948 to sc-mainline-release

Change-Id: Ieda699fa895cf7e2ea0f25b0c1dfac1752b688d6
tree: b604848d4716b964d68cd9a1114d7febbd772328
  1. build/
  2. java/
  3. javatests/
  4. tools/
  5. Android.bp
  6. OWNERS
  7. PREUPLOAD.cfg
  8. TEST_MAPPING