am d150a2c4: 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 'd150a2c4884aa1527042bf32ab72f9928875276a':