Merge "Revert "Add API Coverage for java.io and libcore.io methods""