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

Change-Id: I2bc1fe1b9834ab56575db0c2e6fa96b968550382