Merge changes Icbd72470,I57580933

* changes:
  Reland "servicemanager: fix lazy service issues"
  libbinder += StagedRollbackTest