Merge "Fingerpint: HIDL: Fix annotation typos."