Merge "Add Java 6's java.io.Console." into dalvik-dev