Merge "Remove nio cruft." into dalvik-dev