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

Change-Id: I5615c10df08d88ef397bd28eaa23582503d4356f