Merge "Use Java code from external/chromium_org" into chromium-dev