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

Change-Id: I3a635cfbc7d8d322741270881de6bb757fe2a9fb