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

Change-Id: I48edc46788a091448ef142adfb6ceabc5f1be87f