Merge "Copy ApplicationInfo#versionCode field" into pi-dev am: a4d6570b2f
am: d5160491ef

Change-Id: Id8349ebdd4790b4fac61403155c4c55d40a0247b