am d4cf13a6: am 52cde727: Fix docs builds.

Merge commit 'd4cf13a651ecc7dde5a2a68062d4d9d569967183' into eclair-mr2-plus-aosp

* commit 'd4cf13a651ecc7dde5a2a68062d4d9d569967183':
  Fix docs builds.