Merge "Revert "Remove GraphicBufferSource wrapper from OMX HAL: 1""