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 am: e562055a

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



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