Merge "Drop capabilities in reconcileSecondaryDexFiles" into oc-mr1-dev