Android.mk change, add back IOHandler
Code change, add back IOHandler