Merge "MediaCodec: Release lock before calling onFrameRendered()" am: c03b91a7ef am: 23b72c725c
am: a802a56b45

Change-Id: I2428e273bed9d458887c677f7391510e6f0461ed