Remove span-wrapping of link='' images

This hack is no longer neccessary now that we no longer
use shields.

Change-Id: I2194b16273b1ebe6e8d9360957cc7eab856dae13
Remove div-wrapping of block images

This hack is no longer neccessary now that we no longer
use shields.

Change-Id: If8fbd23ce9ac16bf5f52dc754e04f0a100f374fd
Merge "Remove span-wrapping of link='' images"
Merge "Remove div-wrapping of block images"