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

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