camera: add support for 2.1, 9 and 13MP picture sizes

Change-Id: Ic0b174e7e2be8e12c9fa694c93d8cedd1ee7d576