Merge "Lose xz-embedded to external/xz-embedded."