am ccc445f6: am 20615c2b: Merge "Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml"

* commit 'ccc445f6593e8267496e4a673a1a93c647b63d53':
  Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml