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

* commit 'b18e700cb9c1d7090904449fc6878b8eae1d4693':
  LayoutLib: support the new baseline/margin query API.