A fix for travis-breakage, for Mac PSTree plugin and for flaky
list_files test.

BUG=
R=amoser@google.com

Review URL: https://codereview.appspot.com/188010043