am 9d31e1be: Merge change 26686 into eclair

Merge commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd' into eclair-plus-aosp

* commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd':
  Fix broken build.