Merge "makeparallel: reset make\'s unlimited stack" am: a034129
am: 15f63e2

* commit '15f63e262ea685ff593e5e8c320ab88b0b15d878':
  makeparallel: reset make's unlimited stack

Change-Id: Iffb1189b6e883dbe7730cff571fb2836987aa66d