Merge "Don't set HAVE_LINUX on non-Linux targets" am: ffc0bca66f am: e8c5780353
am: 097c56c09a

Change-Id: I3d786c52b7d6d97a4700c12c57660bf5c9457480