Don't branch OpenSearchXML, it's now in core

Change-Id: I5ad5853a9fbcba4cc4074831cb4ef20938a4870f