Merge "Do not adjust PT_GNU_STACK segment"