Camera FPS hack for 1080p h264 encoder by Braccoz
CM10.1 av updates.
Updating to tbalden's Gerrit suggestions.
Adding my current used framework_av because people think I might be hoarding evil secrets.
1080p Hack

Conflicts:
	media/libstagefright/CameraSource.cpp