Merge "Removed XmlAdapters from frameworks." into honeycomb