Merge changes I4d349d67,I504594d0

* changes:
  media: retain codec name for MediaCodec.getCodecInfo
  media: advertise new-style codec aliases