Merge "(reland2) Remove emulator dependencies on non emulator targets (2)"...

Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main am: 76d1e380 am: f1fc68b1 am: 931b7ca5 am: 501fce7e am: ba806fa9 am: fa0f6547

Original change: https://android-review.googlesource.com/c/platform/build/+/2654583



Change-Id: I0de60df61d18590828e537215fde23dc04fb67dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>