SnapdragonCamera: fix app freeze with HDR and Macro+

When scenemode is set to HDR and then Macro+, HDR is not turned off.
This will cause media server crash and app freeze. Turn off HDR when
Macro+ or Optizoom is enabled.

Change-Id: I51d7df55bb2c0dffd94d1ddadababaad62e3fe27
CRs-Fixed: 879081
1 file changed