Merge "LayoutLib: fix moveChild again." into honeycomb