Update fingerprints

Change-Id: Ibce2425c9a2f560005ed40cf159bcec3350683cd
Reoncile unified d2 properties with cm's cm.mk

Change-Id: Id3e133acdd159be4758696b078f089beea4197ab