am 43ed3947: am 69aea147: Merge "Fix user-build on fugu."

* commit '43ed3947d4b80854dfb133c3d57856eaaa6ec761':
  Fix user-build on fugu.