Merge "Sane ownership/permissions for directories in /data/nativetest{,64}." am: 5d75c9d9c2
am: c6ec2aba01

* commit 'c6ec2aba015a216e6232ee2010f914821c30fc74':
  Sane ownership/permissions for directories in /data/nativetest{,64}.