Fix typo

Change-Id: I311f608d761987d0c714be9ab81188a3ca8eef61
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	media/libstagefright/OMXCodec.cpp