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

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

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