Merge "Move SDK system-image source.prop_templates in their own folder."