Merge third_party/ots from https://chromium.googlesource.com/external/ots.git at 98897009f3ea8a5fa3e20a4a74977da7aaa8e61a

This commit was generated by merge_from_chromium.py.

Change-Id: Ib41229bd8fa71b7a56338c5b04902753525aeac5