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

Change-Id: Ie4d9740351684c1d291f79bc8cdbe6028ff690ae