Improve android/patch test