Bug: 68411440 Test: make -j100, verified starting with each of the three options. Change-Id: I73e701a86733e0f8a5d017949052b16cdf58f398 (cherry picked from commit 17947177)