am 46d69e99: am 9ce34617: am 4f9d6f57: Merge "Fix embedded build"

* commit '46d69e9914ad359b63637f9734cf9e85e04af1a9':
  Fix embedded build