Fix up API tests before updating hacking checks.

The new hacking rules will enforce a license header check.
This patch updates a few recent files to clean up the header,
and remove an extraneous print function that snuck in.

Change-Id: Iab5e42d139d4414eb74b0ecc62710f0b23b882e4
Merge "Fix up API tests before updating hacking checks."