jsvm: remove merged files and revert changes, iOS and android builds fix