Merge "Delete secondary dex profiles during reconciliation" into oc-dev
am: 74a812c587

Change-Id: Ia31c6372f66a4c1a0e574e1e85dfcc7af1307bfd