Merge branch 'cm' into HEAD

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

Conflicts:
	media/libstagefright/OMXCodec.cpp

Change-Id: I0a043864cff2a83c4ad6ef75cdaa569e64b8627d