Merge "Switch libcore over to a long in DexFile."