Merge "Manually unrelocate odex files generated for test."