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

Change-Id: I14b0606c3d7866f68f7b0e7a7458bb4af4236d0e