am 9137e54b: Merge "LayoutLib: fix XmlUtils.convertValueToInt" into honeycomb

* commit '9137e54bd462bfb814c8b8b73f20827e1ba5799b':
  LayoutLib: fix XmlUtils.convertValueToInt