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

* commit '9ce34617a001338093b0de85443925a37a967f0d':
  Fix embedded build