Merge "Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory()" into qt-dev-plus-aosp