am c70e89e2: Fix hybrid build

* commit 'c70e89e2a024645d425b49db2bbf3f20ed68e518':
  Fix hybrid build