Gil changes to android SDK