Fixed building incrementals when "no separate recovery" is specified.

Change-Id: I1d7add44554ebc4b68dc09debdd0c0fb229061a9
colorize non-fatal javac stderr yellow (and actually display it... at all)

woops!

Signed-off-by: nuclearmistake <nuclearmistake@gmail.com>
Change-Id: I984f428022a68a825aa041866e8d459bd6611f71
Merge branch 'cm-11.0' into XPerience

Conflicts:
	tools/releasetools/ota_from_target_files

Change-Id: I4664f8692b9d289d07f3d4ea22328b1ad653ca00