Revert "d2: update to kk fingerprints"

This reverts commit c8641485a91cf224a0e9bbe066febeb3146e2156.

Change-Id: I484f383250ff7f3191b5c10de68264226305eeb5
Merge "Revert "d2: update to kk fingerprints"" into kitkat