am 0f9e4bc5: am ad5789c6: am c70e89e2: Fix hybrid build

* commit '0f9e4bc54411c7e1c1f08299282a8bd0cd9b8d34':
  Fix hybrid build