Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master am: 5de8c0ee40 am: 842447df3c
am: 75af963649

Change-Id: I4a04c1e9863de214f77340e6564c05e90c1d659f