Merge "Fix FileUtilsTest.testCreateSubFile for Android One devices" into mnc-dev