Fix multiple build breaks on master

BUG: 72664439
Test: Local build
Change-Id: Iccf7adcb6324f46682f16fab053a771c251127bf
Merged-In: Iccf7adcb6324f46682f16fab053a771c251127bf
(cherry picked from commit cada73fa5ae2909a4736fa6a0e2e877e2563c1d1)
4 files changed
tree: b98237ef73071b78487d8bad8a16725995eae468
  1. common/
  2. guest/
  3. host/
  4. tools/
  5. Android.bp
  6. Android.mk
  7. OWNERS