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

Change-Id: Ied0e1f1d6ed4432536baeae74858f3f524a2ac65