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

Change-Id: Ib6ccb770dca9b6d759d5756a2cb832c5d05bdb2c