Merge "Fix FileUtilsTest.testCreateSubFile for Android One devices"