Merge "Update references to the new com.android.art APEX."