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

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



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