Merge "Fix @ColorInt javadoc"