Merge "Mecha: Update build fingerprint from OTA" into gingerbread