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

Change-Id: Iee31d969e090898d74931ca5343bb01c9e0ce052