am 445c0bb8: (-s ours) am e8690246: Merge "Move GB SDK components to 2.3" into gingerbread

Merge commit '445c0bb83aa7d794ca52874e51aafc2e4d6dff29'

* commit '445c0bb83aa7d794ca52874e51aafc2e4d6dff29':
  Move GB SDK components to 2.3