Merge "Properly connect to surface flinger in our shell tools"