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

Change-Id: Id4968904ba43183e38c04aa3cc83754bd599c1fb