Merge "Update HardwareBuffer API." into oc-dev