Merge "Make libdexfile build independent of runtime dir"