Merge "[PM] Clean up logic for secondary dex oat files"