Merge change 22667 into eclair

* changes:
  Fix rare NPE due to key being delivered after activity is stopped. #2062930
tree: d5d82843e6f352ddee5127025da8b06be250e42e
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE