Merge "Support non-gtest NATIVE_TESTS"
am: 561b0a3753

Change-Id: I2da6eb4db2e4ee03b2699c60540f79b580a1fad0