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

* commit 'e61f64b332911ba6830959d3d1b59620b1b85dc5':
  Fix linux sdk build.