files modified to build HammerHead in line with CM.
thanks for these updates are for: myfluxi <linflux@arcor.de>
he is the original committer, I modified my code manually.

Change-Id: I1d252b5c0b9339de66104c6d8833650334ae6fac
Merge "files modified to build HammerHead in line with CM. thanks for these updates are for: myfluxi <linflux@arcor.de> he is the original committer, I modified my code manually." into L5