camera: add support for 6.4 and 2.5MP (16:9) picture sizes

Change-Id: I275477da95c9450e69c839b89ff5ab806bf1c3cf
camera: add support for 2.1, 9 and 13MP picture sizes

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