am a609ab49: am cdda1cee: fix the build

* commit 'a609ab4940a2a64224b35d7ae32d00ce4d9aee5f':
  fix the build