Merge "Move the dexfile support to implementation."