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

This commit was generated by merge_from_chromium.py.

Change-Id: I0672f3e0aa945c9ab995a3e40f64b1a14223a3a3