Merge "Use a host java program to generate the background text" am: e4e929ce53
am: a74581a635

Change-Id: I281541e88d0157935ee75eb8e7f1ffdbf3cca0f1