Merge "[COMMON] Update Makefiles to enable parallelization"