Android CTS 5.1 release 2
Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I44c97253e7c000874239a34415b0178332569a7f