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

Change-Id: Id54d8c48a2dea392c81c1e792d1f9c6c2b218c90