am 9c888202: Merge "SDK: Cleanup obsolete xsd."

* commit '9c888202b62c2988b07d7cf52e60413c4ed6a784':
  SDK: Cleanup obsolete xsd.