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

Change-Id: I4d0bfc85d9c42b9d6efdf2f5c2b4a874fbd7ba18