am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."

* commit '6ab8ef21b8826b19e92a47f70d3ba30e04ba66cc':
  Move SDK system-image source.prop_templates in their own folder.