Merge "Fix dex flags for secondary dex files" into oc-dev