Merge branch 'AndroidSocket'