resolve conflict in msm_vidc_dec.h

Change-Id: Ic35ba953864c0628823ced143506e1cf8f8e4074