am 36f94250: (-s ours) am 3f3f34dc: (-s ours) Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.

* commit '36f94250447da75428f409183e9faba2118bd5ae':
  Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.