am 8841bf1d: (-s ours) am 7eada540: Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread

* commit '8841bf1d41f8bc2dee32d881121e1a1c9a15664a':
  Move SDK component to 2.4 - DO NOT MERGE.