remove watermark from anything but koush builds

Change-Id: I5e8ba5e9dd1ecd14ec497b95793144ac132359f5