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

Change-Id: Ia84769566c4c31cee37fb2005228d1fe72cc9662