am a5d35801: am 50dd0170: Merge "Fix linux sdk build."

* commit 'a5d358011e16abdc29ac600a40d96e5b5d59cd7a':
  Fix linux sdk build.