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