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

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



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