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