Merge "Fix a typo in VideoView.java that disabled the seek-back button by default."