Simplify whitespace handling in build/ Jinja templates

Source/build/scripts/templates/macros.tmpl

+{# FIXME: replace with custom filter (already in bindings) #}
 {% macro wrap_with_condition(condition) %}
-{%- if condition %}
+{% if condition %}
 #if ENABLE({{condition}})
-{{- caller() }}
+{{ caller() -}}
 #endif
-{%- else %}
-{{- caller() }}
+{% else %}
+{{ caller() }}
 {%- endif %}
-{%- endmacro %}
+{% endmacro %}
 
 {#
     FIXME: Do we need to put license blocks in generated files?
 #}
-{% macro license() -%}
+{% macro license() %}
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 11 matching lines @@
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 {%- endmacro %}
 
-{% macro lower_first(s) -%}
+{% macro lower_first(s) %}
 {{ (s[0]|lower) + s[1:] }}
 {%- endmacro %}