Merge "Fix CTS : BitmapRGBAF16Test#testSetPixel failure" into oc-dr1-dev
am: c025347cf2

Change-Id: I67be64383eeac28ea84ae02a351a92d078b4dac8