Merge "Replace com.android.internal.R references with android.R."