Merge commit 'b6684b2be0a1b2672893bc5428545c091fa5c91a' of sso://googleplex-android/platform/external/modp_b64 into HEAD
Change-Id: I59f17a01c4c91bb49f8145c3d53604a5cb2fe85a