Parallel build fixes the last maybe

Tested working on linux, linux w/ tests and droid.

@elupus @wsnipex