Non-module targets in art. am: f0295201c2 am: cd6734ed83 am: 66a7703f42

Original change: https://android-review.googlesource.com/c/platform/art/+/2050350

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