update to SDL-2.0.4+9174 from hg. take note this revision requires android xml and java updates