Android 5.1.0 release 4
Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id2579b1aabf6c5e804383e7c1fc9fb39de3dad8d