Merge "LayoutLib: Update to use the new moveChild API."