Merge "Convert frameworks/opt/colorpicker to Android.bp" am: 9cc362c55d
am: 6d9b727956

Change-Id: Id48ba61d5e7a9db537ae5415dfbecb1c5b8e585a