Merge "Fallout from HardwareBuffer API update." into oc-dev am: 54c4dff2c5
am: fca5ce2a99

Change-Id: Ifab707c8faf5bcf49f1f732fa62ae307f99f446b