Merge "Revert "Revert "Make libdexfile build independent of runtime dir"""