Merge commit 'fb11862390f6468a24a3a7aef57ffcfc0f5a3290'

    Merge "Increase default runtest -j to 16." into ics-aah

Change-Id: I150ea819617fcfa0e60d14e758d002849718dda2