am f596d697: Merge "LayoutLib: fix Capabilities and getDimensionPixelSize" into honeycomb-mr1

* commit 'f596d697b69705daa7bc21485659bd704ec5d52e':
  LayoutLib: fix Capabilities and getDimensionPixelSize