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

Change-Id: I9d8aa503e37050c8efb33b61e85be3d3152835cf