Merge "Sane ownership/permissions for directories in /data/nativetest{,64}."