Merge "Non-module targets." am: 03ea8842 am: d13457d9 am: 4b209efd am:...

Merge "Non-module targets." am: 03ea8842 am: d13457d9 am: 4b209efd am: 6067d6f3 am: 743607f6

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



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