AUI-1545 Form builder Checkbox and Radio have incorrect markup

Ticket: [AUI-1545](https://issues.liferay.com/browse/AUI-1545)