am 60c44805: Merge "Fix FileUtilsTest.testCreateSubFile for Android One devices"

* commit '60c44805fd5ff79026742f9d4ef0ca6833ca30e8':
  Fix FileUtilsTest.testCreateSubFile for Android One devices