Merge "Merge "Update HardwareBuffer API." into oc-dev am: 649040c7f6 am: d5fcb3a45f"