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

Change-Id: Ia6c4cb26f2d5d8c485f1139ac128e7482b6235a0