Shamu: fix Google Camera FCing on HDR+

Change-Id: Ife1a295fa5d413aa9e1d3d758ca102058dacf393