Merge "Fix parsing the versionCode/Name of apks with aapt." into studio-1.0-dev