Integrate add_watermark.py into createfont.py

Bug: 187961485
Test: manually done
Change-Id: If99657b7973dd881a2994e93cb02bb11f40f35ab
2 files changed