Merge "Fix debuggable compiler flag detection for secondary dex files"