am 09bb9f66: Merge "Ensure the intent firewall dir exists before starting the FileObserver" into jb-mr2-dev

* commit '09bb9f66a0c258d3393145d31529de92e55e039a':
  Ensure the intent firewall dir exists before starting the FileObserver