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

Change-Id: I8a6456b6f40754dc57fe2dd1ca9d58966c8bd2d3