Merge "Enable libcore.java.io.FileInputStream#testReadProcVersion"