Merge "Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev am: 3a3fb73c am: 27dfd971" into nyc-mr1-dev-plus-aosp