Merge "Move stub APK profile logic to performDexOptUpgrade" into oc-mr1-dev