Merge "Fix the ownership of compiler artifacts for secondary dex files"