am 4cb54cd0: am 02519dac: Merge "Basic test of MediaCodecInfo.CodecCapabilities" into klp-dev

* commit '4cb54cd0607c9b82808a4c4b01a790be300453cc':
  Basic test of MediaCodecInfo.CodecCapabilities