Merge "Fix building static linux binaries" am: 8bb71cef9f
am: 5cf6a4578d

Change-Id: Ic8f3a7eb287e42f029c36653c2c7a3c0de65b155