Merge changes If6611d64,Ie55c3ac1

* changes:
  init: remove unneeded special cases from FscryptInferAction
  init: fix mkdir to reliably detect top-level /data directories