Merge "Avoid reading HW bitmap pixels twice" into oc-dev am: afe23b9b53
am: 257a070939

Change-Id: I2fe3e48d06c55e30a4e6dcf2779f17b1fe1939cf