Android 5.0.2 release 3
Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: Ifdd14275a751fa5fa27587c154b28a720497aec1