android: change goldfish branch

Change-Id: Id55b11eb40dda63c9577088f9eb04cd2bddd7fb2