Merge "Update build version information." into gingerbread