Merge "Don't match wrap_content/match_parent children with child count = 1. Bug #3328711" into honeycomb