Add another variation of 13Mpx

This code blows, we should make this automagic...

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