camera: Add 2.4MP, 6MP, 7MP resolution strings

Change-Id: Ic2e4d4ef1345743150d5be1fb9a0f17c909a2ff8
Merge "camera: Add 2.4MP, 6MP, 7MP resolution strings" into cm-10.1
Merge remote branch 'cm/cm-10.1'