Add 20.7MP resolution

Change-Id: I25b06b3829864f99a01d6911d5850a41ee496628
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2