am 85da9313: am d0f3e858: Merge "android_filesystem_config: add /vendor" into jb-mr2-dev

* commit '85da931345fd420bc2959d79361058efa974f465':
  android_filesystem_config: add /vendor