Merge "Match API changes from http://crrev.com/284123004" into master-chromium
tree: 70c4ea5f884550764db33038ec26cbce70324a2b
  1. chromium/
  2. Android.mk