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

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

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