[automerger skipped] Inline contents from embedded.mk in uml.
am: 519ee58ec3  -s ours

Change-Id: I6ea09ba6a83d530d22a8cc0519fd6bdb4a3688d5