NXP-15858, NXP-16090: update code templates to match formatter