Merge "[DCAEGEN2] Use generic makefiles"