Fixes for andriod-hybrid.js and chromedriver.js.

Fix for bugs introduced by the following commits:
https://github.com/appium/appium/commit/570d6beb85cea48c4dd78b6b0089e88437ea0822
https://github.com/appium/appium/commit/f8d8e5513e706712eeda349e7d50cf03f3eb7573
Merge pull request #3398 from paymand/chrome_options_fix

Fix for 'chromeOptions'.