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

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