Merge "Remove dependency on libdexfile internal header."