Always use ApplicationVersion

Author: dellis1972

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

@@ -595,8 +595,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
     <_AndroidPackage>$(ApplicationId)</_AndroidPackage>
     <_ApplicationLabel>$(ApplicationTitle)</_ApplicationLabel>
     <_AndroidVersionName>$(ApplicationDisplayVersion)</_AndroidVersionName>
-    <_AndroidVersionCode Condition=" '$(AndroidCreatePackagePerAbi)' == 'true' And '$(ApplicationVersion)' != '' ">$(ApplicationVersion)</_AndroidVersionCode>
-    <_AndroidVersionCode Condition=" '$(AndroidCreatePackagePerAbi)' != 'true' And '$(_AndroidVersionCode)' == '' ">$(ApplicationVersion)</_AndroidVersionCode>
+    <_AndroidVersionCode>$(ApplicationVersion)</_AndroidVersionCode>
   </PropertyGroup>
   <AndroidError Code="XA1018"
       ResourceName="XA1018"