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

* commit '4eca262902644d38b0f2a593a54cc67cbc28477c':
  LayoutLib: misc fix.