Merge "Add proguard.flags for missing guava dependencies."