Squash commits for colorful output

*Adaptated for lollipop

contains:

http://review.cyanogenmod.org/#/c/24785
http://review.cyanogenmod.org/#/c/75464
http://review.cyanogenmod.org/#/c/75399

credit to the original authors