[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 862534aa98 -s ours
am: da34666713

Change-Id: I9b732c201a88fec90f189350b48d16fc8859a21a
tree: 55199614bc58cb28e88c67295c3bb4673e4f1db6
  1. src/
  2. Android.bp
  3. CleanSpec.mk