am 6b9784b0: am 288d90c2: Merge "The "current" SDK stubs jar should use the full apk that\'s exported, not the product-specific one." into gingerbread

Merge commit '6b9784b04249d42f1f2c68cfd30fa4d3322a3b75'

* commit '6b9784b04249d42f1f2c68cfd30fa4d3322a3b75':
  The "current" SDK stubs jar should use the full apk that's exported, not the product-specific one.