Merge "Convert frameworks/opt/colorpicker to Android.bp"