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

Change-Id: I0cbbc5ac102c34c1bee94f5b6ff48f661b8174e7