Merge "Convert colorpicker to aapt2."