pasted in up to date versions of some android files from a previous branch