am 9d2b0dbf: am 12c4c0e4: Merge "Fix deadlock of WebViewCoreThread"

* commit '9d2b0dbf67844ead1a0aeb22e1e3097d2ec60171':
  Fix deadlock of WebViewCoreThread