Merge remote-tracking branch 'caf/kk_2.7_rb1.9' into HEAD

Conflicts:
	dashplayer/DashCodec.cpp
	libstagefrighthw/QComOMXMetadata.h
	mm-video/vidc/vdec/src/omx_vdec.cpp

Change-Id: I2326cc053638b85f795908ad9547b7927a23066b