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

Change-Id: I49687761d304075acc048afa2e97e4b0b9b84680