Merge "Revert "Make libdexfile build independent of runtime dir""
am: 85f890b792

Change-Id: I7cae1bc90efcc17cfdf98433b0f0e5e867d315bd