Update sunfish SVN to 42 Bug: 223313197 Change-Id: I8cb88e09c0526ba1092bb035ea94232cbdd43c87 (cherry picked from commit 178cadf774e192ae444dd11e52166cccb67a11fb) Merged-In: I8cb88e09c0526ba1092bb035ea94232cbdd43c87