Android l-preview release 2
Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: If6dcb6e8c436754661eaea9437ad414643b73992