am c8edecc5: am 32afc638: Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev

* commit 'c8edecc5432d8b1d7c487d7a6f3bc6339358afaa':
  Remove android.util.Log from FileUtils