Merge glue layer up to 7f6067d into AOSP.

Bring the AOSP version of the glue layer up to date with the current
internal version.

Change-Id: Ibb993d77c9bcd6d4f4d5b2929a76118a419e3826
tree: 5270a74a3f5c138c5233e3b545b6d6b1863660c3
  1. chromium/
  2. nullwebview/
  3. Android.mk