Merge "Add service_contexts to embedded.mk."