Merge "Added cleanup step for the switch to stlport for gtest"