Merge "media: fix MediaCodecTest#testException" into rvc-dev am: c5162ed949 am: 4ceb914202 am: 6c21a62488

Change-Id: Ia5a2657a3158aca456911f8cda0921cf4975173d