am 2f9f50bb: am ef39b261: (-s ours) am 5b476736: am 9498fc68: Merge "Use glog for logging in the OSX USB layer"

* commit '2f9f50bb117259baf9aabae61106e2bf45e13e9b':