Merge "Add version strings from android-info.txt into build.prop"