Merge "Rename COLOR_FormatAndroidOpaque" into jb-mr2-dev