Merge "Merge up to 24c4a3d7 from chromium-dev."
tree: e1ce1383327c55b5f41d2f86bec670710baadcce
  1. Android.mk
  2. chromium/