Fix invalid copyright header

Change-Id: I8957eeb8c087a7a3f6aa8b417eb52689e6c28025
Remove unnecessary Webkit scrollbar test

Change-Id: I58c8216b35355c3e84ab0b31300988a0957c1b85
Merge changes from origin/7.1

4f7fc2d Fix invalid copyright header
43b8ca5 Remove unnecessary Webkit scrollbar test

Change-Id: I6153a89f689818fa9f612d4b22303f7d4030fa6d