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

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

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