[android] revert 3.5 changes