adaptation for hammerhead

Let's not branch out with dhd - will just increase redundant src
I will close this PR and re-create it for hybris-10.1 (which in turn eventually be renamed into "master")