Merge "embedded.mk: allocator service" am: 0aef0b59af am: dc7d29ed86
am: 51108a3e6d  -s ours

Change-Id: I5f11c2ce093321e72ba9863c2607b65f16a16beb