Merge third_party/ots from https://chromium.googlesource.com/external/ots.git at 011a74db66c39c0d8cb6cb2fb6a62c38dd0e1fe0

This commit was generated by merge_from_chromium.py.

Change-Id: Ifc8f21c2c580f0ba7ae986d6ab94635ffc402a7c