Merge "Support non-gtest NATIVE_TESTS" am: 561b0a3753 am: 1ef5112475 am: 4ad881c067
am: 27f489cd00

Change-Id: I85c5afe2a217c8335320885b00fc61ffbf159ba7