Merge "stagefright cmd: add HEVC mime type" am: 19a18612be
am: 1e0da64292

Change-Id: I3378a6b2d3c033307786f5891f9d4e0d448bca43