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

* commit '32afc638e9aed9a80cd25d0884406b7394a6ac60':
  Remove android.util.Log from FileUtils