Merge "omx: collapse unpopulated slot messages in GraphicBufferSource" am: 2a27078d9a
am: 3ccef7847f

Change-Id: Ia6ebfb771e6eb8e3135039e34535346f84631111