Camera2: Fix crash on cameras with 6mp 16:9 resolution

Change-Id: I54c8a8245905cc7dc5e09fac6a3edf55f839f4f9
Merge branch 'cm' into HEAD