include ffmpeg codec

PS2: include ffmpeg after google's codecs

Change-Id: I48bce8dc05d7d5ddefa27fc0bd9eaa711e03c3c1
Merge branch 'remote' into mkl