Merge "Lose xz-embedded to external/xz-embedded."
am: 39a0299cfd

Change-Id: I3a837424803499b896b8d073e9b17609ed461c3c