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

Change-Id: I88abe8764bc50e1e1498cb02794c1728ad5bea69