Merge "Non-module targets." am: fc0dcc1b am: 664fd353 am: 1e163922 am:...

Merge "Non-module targets." am: fc0dcc1b am: 664fd353 am: 1e163922 am: 22b0086c am: 2f8261b7

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



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