Merge "ART: Move target APEX checks"
am: deb9c01442

Change-Id: I861e39aae8b0598b1839d29e469315b99011435d