am e8690246: Merge "Move GB SDK components to 2.3" into gingerbread

Merge commit 'e869024635a4e78c9fc3b3a696623e7cf9d999e0' into gingerbread-plus-aosp

* commit 'e869024635a4e78c9fc3b3a696623e7cf9d999e0':
  Move GB SDK components to 2.3