Merge "Fallout from HardwareBuffer API update." into oc-dev