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

Change-Id: Ida599c569b7e88f50af6ffd267e4a67275e654fc