Merge "Frameworks/base: Hand fingerprint to ART"