Merge "omx: collapse unpopulated slot messages in GraphicBufferSource" into oc-mr1-dev am: ad456ce8b9
am: 1ba168180e

Change-Id: I22dc1f141bf332623e39e82978c1499f83426bb5