Merge "Move the dexfile support to implementation." am: adebae2ca6
am: be141b1453

Change-Id: Ib769157b4a971aae38f95f3e3a296abbc490ed49