Merge "embedded.mk: allocator service" am: 0aef0b59af
am: dc7d29ed86

Change-Id: If5d9b58c346c550d1feff1f119096ba66ccdc767