Merge "Revert "Refactor GraphicBufferSource wrappers for OMX HAL""