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

* commit 'b5df7d483772d1dd08a1d5c8614f38a79e43ec12':
  Add version strings from android-info.txt into build.prop