am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin...
am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit 'b18e700c':
LayoutLib: support the new baseline/margin query API.