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

* commit 'd84869fbb8589430981ba19d2d1cbc9ef58b8df3':
  Fix build some more