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

Change-Id: Ie35e34eb1b3a65e87448b55c57fdad40e8671efa