Merge "stagefright: remove OMXNodeInstance usage from GraphicBufferSource"