Merge "Improve seeking for Xing header without TOC"
am: cd17b7453d

Change-Id: I7b779ab06770e8c15e143a3f33ecbab38ed03b04