am 5570651e: Merge change 4730 into donut
Android (Google) Code Review authored
Merge commit '5570651e'

* commit '5570651e':
  fstest: Fix device, directory, and file permissions for VPN.
57bcf869