Merge "Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev am: 3a3fb73c75 am: 27dfd971b0" into nyc-mr1-dev-plus-aosp
am: 96407a2169

* commit '96407a2169a44a7b6b9c4c17083dda05257df6f0':

Change-Id: I26fa6010ab411ad5977ea9ec00c71320d943f9a8