Merge "Convert -j to a reasonable parallelism for kati" am: bb5c13d359 am: 57de869060
am: 8b8c5d98f1

Change-Id: I94f427a5830c5400c0ad96b73b59210ebb845d7b