Merge commit '12db436d227ad9b97cb3d13812e1175cf9be8ed6'

    Increase default runtest -j to 16.

Change-Id: I17adc7c585559ffbd6612b6bf9276cb3c5131f83