am a85373e8: Merge "Manually unrelocate odex files generated for test."

* commit 'a85373e8ab4a3b090eb60eba05be6f13dcd15567':
  Manually unrelocate odex files generated for test.