Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread