Update xt907 + 1060 fingerprints + going OCD on mk files

Change-Id: I82f82ab688d3dacb6fa55e5ec42f5dba6305a756
Merge "Update xt907 + 1060 fingerprints + going OCD on mk files" into kk44