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

Change-Id: Ide1466a844c1bb5b5b8ae610d812cd38610f1ab1