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

Change-Id: Ie5cfe94ea18642c1bd5f4b7e3c92524407b85815