Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread

* changes:
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.