Merge "Move stub APK profile logic to performDexOptUpgrade" into oc-mr1-dev
am: 4f1844cb2d

Change-Id: I09c82246b6f61045c2e1911f96f995d309ea4978