Merge "Create version of dexlib2 without guava built in"