am cb733bc5: Merge "Fix droiddoc generation."
am cb733bc5: Merge "Fix droiddoc generation."

* commit 'cb733bc564d974cfd3fe08be1d0e5c06cd85911f':
  Fix droiddoc generation.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build