Merge changes I4c0e7fdd,I9ea3827a

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