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

Change-Id: I82abfc53ebde3e794b36129cad031dfb7cc49f0b