Align hammerhead blobs with CM

Change-Id: Icac02cc47627e761862cfb221fd556292c6a792a
Merge "Align hammerhead blobs with CM" into kitkat