Merge "Layoutlib: update with new add/movechild API."