Let's merge and diverge

This is a sub-total merge with CM.  At some point we got some taint that is affecting HDR (hardware) + camcorder

Out camera is mostly driven by CM, so let's merge and diverage as needed

Change-Id: I2e4415c3ada880b3bd34619c6df8521bcbe97070