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

This commit was generated by merge_from_chromium.py.

Change-Id: Ie98f2feb8e40737b108d2e05749f2012030f6e3c