Revert "Added the HDR commit to the correct location this time"

This reverts commit 3fbbbffc8edf7b69bd6e50abeea0f11633a5c435

Change-Id: If211b429d7f326c900eaf6e144bcd508e6880b68
Merge "Revert "Added the HDR commit to the correct location this time"" into jb4.2