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

Change-Id: I7c115293cc3dc86b7354b60ddf23b1bf5181ed6e