am 745602d8: Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state"...
am 745602d8: Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" into lmp-mr1-dev automerge: 8bc9b3af
automerge: 3584a1af
* commit '3584a1af':
MediaCodec: Prevent stop() in the UNINITIALIZED state