Merge "omx: collapse unpopulated slot messages in GraphicBufferSource" am: 2a27078d9a am: 3ccef7847f am: 96a1f1648a
am: 250cbc71e2

Change-Id: Ia51dd96bf34aae0f84a77f83000ed386b3aeac54