Merge "QCamera3: Update for HDR+ header changes" into oc-dr1-dev am: 675232ebcb
am: d9a49ccbaa  -s ours

Change-Id: I223e2d125b9ed7943e270421c953f84e59252b33
tree: d7fff436c240ce1aa5ba79b26ee5fcf9ef5ec745
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk