Adjusted gtest-port.h to work when ANDROID is defined. Removed from the makefile the explicit OS setting (was linux) Added a new OS: Android. When -DANDROID is specified during preprocessing, the right includes should happen.