Put FileUtils back into android_runtime

We still use it for non-fat volume management

Change-Id: I42efeb83b8f12e7734e4bf03326526cc220d022a
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0