Merge "Fix up android.core CTS tests."