Roll gyp r1854:1857

r1855 sdefresne Fix a local rule reference
r1856 scottmg   VS 2013 emits a warning when two source files have the
                same name
r1857 torne     android: set ASFLAGS as well as CFLAGS

NOTRY=true

Review URL: https://codereview.chromium.org/175433003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252688 0039d316-1c4b-4281-b951-d872f2087c98
Update .DEPS.git

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252689 0039d316-1c4b-4281-b951-d872f2087c98
Fixed the unexpected error bubble with skip for now

It also fixed the scroll issue 344329, and win8 mode issue 331752.

BUG=345665, 344329, 331752
R=zea@chromium.org
TBR=rogerta@chromium.org, xiyuan@chromium.org

Review URL: https://codereview.chromium.org/170683003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252690 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 252689
SVN changes up to revision 252690