Merge remote-tracking branch 'cm/cm-11.0' into HEAD
mm-video: fix string literals for c++11

Summary: ...

Test Plan: verified

Reviewers: randall.rushing, synergy

Reviewed By: synergy

Differential Revision: http://review.codefirex.com/D625

Change-Id: I176c84490e2659f469a8e2d6e9cb18d60f562041
Signed-off-by: DHOMD <DHO@dho.im>