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

Change-Id: I48d84d0d28d476dae84201b68e943e3ad4dae500