revert: CPCAM additions from omapzoom

Change-Id: I76254393cfbe1457a5966b7fbff61272d47f56ec
remove extra omapzoom code

Change-Id: I13aa31eb4fab04974c4b65ca9a59585c29a83f1a
Merge remote-tracking branch 'sts/jellybean' into jellybean

Conflicts:
	media/libstagefright/AVIExtractor.cpp
	media/libstagefright/OMXCodec.cpp

Change-Id: I1e5f48428c874867a4c758e881b499d8dc12edac