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

* commit '0882a90e1a357dc6882075b6b6e7c0b14de90645':
  Ensure the intent firewall dir exists before starting the FileObserver