New public toilets to come up at 21 locations under Smart City Mission