"Include non-zero dimension views in excess space calculation" and "Always distribute excess space in LinearLayout measurement" changed LinearLayout behavior significantly in a way that wasn't covered by CTS tests. This reverts commitsda2f304409and4fabc02158. Bug: 22862047 Change-Id: I8d37a525ccf295445d3239b80e5cacb10bf3c947