Fix video thumbnail generation

Conflicts:
	media/libstagefright/StagefrightMetadataRetriever.cpp

Change-Id: I98513403a51b49442ae2d306e444af000ea318b5