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

Change-Id: I436b2aa46e6582c2753f7b66e5d95bef27fd5e5d