Hammerhead adaptation

Merging into hybris-10.1 which will eventually be renamed into master, because dhd is underlying-android-base-independent