Merge change 6868 into donut

* changes:
  Test to ensure that /sdcard is mounted with security-critical options.