Merge "More merging of nio into luni" into dalvik-dev