Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
galaxys2: camera: enable useProfileVideoSize

fix video preview aspect ratio

Change-Id: Ie3777670b0a368c367615a4f2a11ea35beb07dd1
Merge branch 'cm-10.1' of git://github.com/Team-Hydra/android_device_samsung_galaxys2-common into cm-10.1