Yes, good idea.
but I think *OES functions I did commented out are related only to IOS.
So I thought It will be file.

Anyway, I can add some ifdef stuffs.
I will do re-PR.