Merge "Fix some flakiness in hostname tests." into dalvik-dev