Merge "Fold service-jobscheduler and service-blobstore into services.jar" into rvc-dev am: defd82296d

Change-Id: Ia0db516703c9f9c7f6f7aeed2a0364f248a543ac