am 85de0087: Merge "LayoutLib: misc fix." into honeycomb

* commit '85de0087fc6a65a66d3994f0b8dd3fecd9db2526':
  LayoutLib: misc fix.