am 29534f62: Update for improved glue.

Merge commit '29534f6275fdc4cba1c732f89f8442b6d887eb50' into gingerbread-plus-aosp

* commit '29534f6275fdc4cba1c732f89f8442b6d887eb50':
  Update for improved glue.