[automerger skipped] Merge "stagefright cmd: add HEVC mime type" am: 19a18612be am: 1e0da64292
am: b0096520d5  -s ours

Change-Id: I58b173cf677a5c3aa93e2451d5a69d995b9150ae