Merge "Make libdexfile build independent of runtime dir" am: ea5575b241
am: 0000991b10

Change-Id: I24b870195dc674d1af837cd386bd18264f8f6c17