Merge "Move listen() over to using android.system.Os"