Merge "Non-module targets." am: ff15a27b am: 7c30a61b am: 6687e127 am:...

Merge "Non-module targets." am: ff15a27b am: 7c30a61b am: 6687e127 am: fdfbd833 am: 3ce20b99

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



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