Merge "Remove unreachable code in DexLocationToOdexFilename."
am: da3f60aed2

Change-Id: I0114c6c276251ee2a46ce4fb5a85b8ebe662599a