Merge "More non-module targets." am: 9a21773efe

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

Change-Id: Idbabc172ebf9b5f841af7ff4485828add92f7cb3