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

* commit '741b6acbf88e0a08703fdab295fc2697adf6c1c6':
  Remove android.util.Log from FileUtils