Merge "Close file descriptor after test finished" into android13-tests-dev