Merge "Use stderr to avoid mangled print statements."
am: a994748a3c

Change-Id: I7d4725fba1ad0363b36b80d9cc07ec90b5439d26