Fixes compatibility with Sun C++ (by Hady Zalek); fixes compatibility with Android (by Zachary Vorhies). git-svn-id: http://googletest.googlecode.com/svn/trunk@555 861a406c-534a-0410-8894-cb66d6ee9925