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

* commit '7b14e7c051eabf2f9b3e2f8035d8330a4924d930':
  Fix linux sdk build.