Merge "omx: collapse unpopulated slot messages in GraphicBufferSource" into oc-mr1-dev