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

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