am c91f9fe5: Merge "Avoiding cyclic references when unbinding from a service" into gingerbread

* commit 'c91f9fe542fd1ca9d6da432faeba60d35c4d5c49':
  Avoiding cyclic references when unbinding from a service