Merge "clean up default fingerprint HIDL@2.1 implementation"