Merge "Update fingerprint.h for new API"