Merge "vivo: update fingerprint" into gingerbread