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

* commit 'd0f3e8588a58e1687ca4336609e809351e94e2d8':
  android_filesystem_config: add /vendor