am a4961e66: am d84869fb: am a0915abd: Merge "Fix build some more"

* commit 'a4961e66b539d69b7656d93db05371b20efc8f3b':
  Fix build some more