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

Change-Id: I4b81d26d8d74989609f7be075cb59349a656837e