build: Cleanup and fix merge derp

 * Fix VBOOT/VERITY desparity introduced in
   https://github.com/CyanogenMod/android_build/commit/409f818fccdee9147812b2cb06e703808f55a57a
 * Add some colors lost in rebase
 * Fix endif comments

Change-Id: Ida979250d3cfeca0c534083c76c08b5d13f08689
1 file changed