Merge "Remove bogus extra alignment from sbrk."