Merge "build_mixed: removed product.img if system_dir does not have one."