Reduce diffs between buildfiles#397

mernst merged 2 commits intoplume-lib:masterplume-lib/reflection-util:masterfrom

mernst:heap-sizemernst/reflection-util:heap-sizeCopy head branch name to clipboard