Merge "Remove special case for com.android.art.release, which no longer exists."