am 64dd84a9: am 003f84fb: am c80e876c: Merge "Add service_contexts to embedded.mk."

* commit '64dd84a94f468b0e70996c55411d2be08c985267':
  Add service_contexts to embedded.mk.