Merge "Add product-services.img for `fastboot flashall`." am: 8b8d7d67f2 am: 586282a771
am: 477b67e379

Change-Id: Id8aa647d00782b9a83b860222afc4e49c62ed9a5