am 6ae56056: (-s ours) am 052ad4d7: Merge "cts - MediaCodec async callbacks -...
am 6ae56056: (-s ours) am 052ad4d7: Merge "cts - MediaCodec async callbacks - DO NOT MERGE" into lmp-dev
* commit '6ae56056':
cts - MediaCodec async callbacks - DO NOT MERGE