Merge "camera: Change HDR+ shot hint to 2s" into oc-dr1-dev
am: 0a58196a64

Change-Id: I237aac163293e9d99094dd546e99d3e0540713f9
tree: c2d02e6258fe310359a0926fa1f3b7d0d578345d
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk