[PM] Clean up logic for secondary dex oat files
am: e69fba3f7f

Change-Id: I223b27221acf25e628003dde0f63cffe66779753