[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: feb4350cae -s ours
am: a64bb35210

Change-Id: Idf733e51aaecacca3e789ceb7ec38b3df8e247b4
tree: 83471e5f6424f9a88c0609c8ca62445ce7ee5f0e
  1. include/
  2. src/
  3. Android.mk
  4. gen-buildcfg.sh
  5. OWNERS
  6. vnd_buildcfg.mk