[automerger skipped] Merge "Pass platform version name as --version-name for...
[automerger skipped] Merge "Pass platform version name as --version-name for framework-res.apk" am: 94a95e13
am: 27af6ec3 -s ours
Change-Id: Iac417d144499e4db1ed1c0492381f0698fa34ba4