Merge "Drop capabilities in reconcileSecondaryDexFiles" into oc-mr1-dev
am: c40416d0a1

Change-Id: Id693d25dddfe197a9cb4ec6b3fefff09da08f2f0