Merge "Support to build vendor.img" into jb-mr2-dev