am 39e78884: 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 '39e788847a3c68cc4b31dd0efc764d14414e1283':
  Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml