Merge change 24565 into eclair

* changes:
  Add missing @Override to DroidDoc and ApiCheck