Merge "LayoutLib: fix XmlUtils.convertValueToInt" into honeycomb