Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1