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

* commit '003f84fbbbffa0eb0b6958a2f7f4a120206decc8':
  Add service_contexts to embedded.mk.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build