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

Change-Id: I7030422a81eca0735e53d46e3763f03485a2c34a