Revert change to target name am: a5d3741fce am: fc9011ef98 am: c16dcd9d14 am: ec9be159a6

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

Change-Id: Ib00a38d67779648587c4b507198ecd854e747cbd