Merge "exec makeparallel"
am: cf8afef2eb

Change-Id: I77aaad7879d65b233e17a90f0196021105596c6e