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