Merge "Add getsockname(2) and getsockopt(2)." into dalvik-dev