Merge commit 'a1d9b3c04528bb0e9fda24d9c820176241b76908' of sso://googleplex-android/platform/external/python/cpython2 into HEAD
Change-Id: Ib42d77482a16a8cea5929b613d38fecea539aebc