am dcd99113: merge in klp-release (no-op)

* commit 'dcd9911315bc6864b61d1d76ca0ff3904227889b':
  Do not assume WebView is running on the main thread.
tree: ca5160cda2266320d1b23327d46dd804e765c0dc
  1. Android.mk
  2. chromium/