Merge "Remove reference to fingerprint.goldfish" into rvc-dev am: 105308fc71

Change-Id: I3feab63697b1eddec33e09a99bd2f5150dd8585f