Merge "Use not_windows instead of linux/darwin"
am: dc848d2080

Change-Id: I6de0caba1c6cbccd4a706397705d613529c92d5b