Rolled ANGLE r534:r536.
Rolled ANGLE r534:r536.

r536 All surfaces follow D3D Y convention
http://codereview.appspot.com/3265041

r535 Build fix needed on certain platforms. Explicitly cast away const.
http://codereview.appspot.com/4043042

TEST=try
BUG=none

Review URL: http://codereview.chromium.org/6254010

git-svn-id: dd90618784b6a4b323ea0c23a071cb1c9e6f2ac7@71834 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser