update catjsrunner for android
fix merge