am ad7bce4c: Merge "DO NOT MERGE - Doclava warnings are now errors." into gingerbread

Merge commit 'ad7bce4ca236393cc2d9ab115cea5a267724f10c' into gingerbread-plus-aosp

* commit 'ad7bce4ca236393cc2d9ab115cea5a267724f10c':
  DO NOT MERGE - Doclava warnings are now errors.