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

This commit was generated by merge_from_chromium.py.

Change-Id: I5a5eab7d972c1c1f9784498886f759cddf52679c