Merge "Don't emit versioncode by default"