Merge change 24514 into eclair

* changes:
  Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.
tree: 5a9247f35f2ba7be849680bf24f655f578bc6109
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE