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

Change-Id: I7cb978ed0c7844c41793e80f581da287abccedc9