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