am 30f05c29: Merge "Fix sdk build."

* commit '30f05c29c56a04f8d8ab2851d0c20a2b66406cfa':
  Fix sdk build.