am 9ed0a872: am 930ab3d9: Fix broken sdk build.

Merge commit '9ed0a8721990303e6264c6affb93b25c8249127b'

* commit '9ed0a8721990303e6264c6affb93b25c8249127b':
  Fix broken sdk build.