am 7485d2ce: Merge "Fix FileUtilsTest.testCreateSubFile for Android One devices" into mnc-dev

* commit '7485d2ceef133bd12811308c57062593b65bbb02':
  Fix FileUtilsTest.testCreateSubFile for Android One devices