Merge "mkv support more audio codec" into qt-dev am: 060016102a
am: f03c527d99

Change-Id: I4e34235a57bdaf1867d21e29d5745707faa55682