Merge "Update BUILD_ID and FINGERPRINT with latest OTA values" into gingerbread