* changes: Remove dependency on internal FileUtils class Remove dependency on com.google.android.collect classes