The following code was broken in the recent android merge:

    (keymap-set button-map "<return>" 'push-button)

The attached patch fixes this.