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