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

Change-Id: I60cae069929a8fca8375ece5078b4301bfcb9370