manually apply #81
merge android 2.3 support
update appcache with new files