Merge "Merge up to 2e8d713 from chromium-dev."
tree: 7ac6994ff2e6e5e0d73219c9382213d2e5898ad4
  1. Android.mk
  2. chromium/