Android n mr1 preview 2
Merge "Revert "Disable the legacy gtest.""