Merge "Tests: never use System.err"
am: af8d813133

Change-Id: I9eff22c6b5033d31643b880e52f7dae5260dec0d