Merge "Minor cleanup of HAL fingerprint API"