Merge 05b7b69c from honeycomb-mr1. do not merge.

Change-Id: I1aca5774dec2e18ab5f9e860f6fd90b481b2857c
LayoutLib: support the new baseline/margin query API.
3 files changed