Improve templates for non Spring compliant MediaPipelineFactory

Change-Id: I4146db168e589583481a02dfd2d59433b423146f