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

Change-Id: I8d47acba4864a3224b1dc05cb42ce538c512187b