Merge "Fix permissions for /data/nativetest{,64}/tests.txt." am: e32cb1b14c am: 8468b26e73
am: 279a033604

* commit '279a0336042e98ef806729144f2ff2362811a4f3':
  Fix permissions for /data/nativetest{,64}/tests.txt.