Revert "Merge branch 'upstream-master'"

Revert submission 1579283-jemoreira-crosvm-update

Reason for revert: Broke build.
Reverted Changes:
I7cf3fe07f:Merge remote-tracking branch 'aosp/upstream-main'
Icb5f26241:Update Android.bp files
I25af576b6:Merge branch 'upstream-master'

Change-Id: I3dbab90871618dcbaf4404ba0d66c73a64c446f7
128 files changed