Wrap inline images in spans with display: inline-block.

Change-Id: I8daac35c752ad33691955b2493191be990c78f58
Merge "Wrap inline images in spans with display: inline-block."