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

Change-Id: I698a75c06e6041ddf403aba2ae5e894308bce2c3