Update Sunfish SVN to 18 Bug: 175313938 Change-Id: Ifbf039a993977a400f5d8be7523c3c2da3d7b4b5 (cherry picked from commit 66d09a69ec314b7a18966140376b72bce76825b8)