#165 Fixing mislocated strings.xml and rounded_corner.xml from backport of mapbox:master