gyp: fix android generator (rebased)

this is a rebase of
a981ef8
After bumping gyp to 19495aa

Actually I just took the file as is, because of a discontinues
patch floating.

Author: robertchiras