am 4a64e0a0: am 3a5fd7be: Merge "Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml"

* commit '4a64e0a01523752115af757dad8f020cb92e34c8':