Android CTS 5.0 Release 7 (2906672)
Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: Ia490b10625692bf8dedb2a1d67598f1225b48225