Merge "Fix the resolving of apk type." into sc-dev