am 0a05678e: Cherry-pick security fix in WebKit change 65329

Merge commit '0a05678e32a04623b93aa4d3990d14877ee80386' into gingerbread-plus-aosp

* commit '0a05678e32a04623b93aa4d3990d14877ee80386':
  Cherry-pick security fix in WebKit change 65329