Merge "Wait for children to exit in makeparallel"
am: 9b1a185029

Change-Id: I9b24ebbf368d2bd480f311c0d115b22cc0355939