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

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