Merge up to 707d93c from chromium-dev.
tree: 3232f7e64656af8b6e6d9808633873ba38bbb0e5
  1. Android.mk
  2. chromium/