Merge changes Ieb566a2a,I953057cd

* changes:
  Use Libcore's stat instead of FileUtils#getFileStatus
  Use Libcore.os.stat instead of FileUtils