Merge "Remove emulator dependencies on non emulator targets (1)" am:...

Merge "Remove emulator dependencies on non emulator targets (1)" am: 2782b82d am: 825ec3ea am: 8bf7d62a

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



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