Follow-up 2075a46: Fix RTL image build by embedding after flipping

Change-Id: I7080d4f122179dfbe9d113caf7aae7114ec853b6
Merge "Follow-up 2075a46: Fix RTL image build by embedding after flipping"