Merge "Revert "Make libdexfile build independent of runtime dir"" am: 85f890b792
am: 6bb8d5a0aa

Change-Id: I1c2b9f3a180538d52e724a38f12891286317ed59