Merge "Use specific RSS check under 64-bit Scudo" am: 90a050ec4e am: a01574e540
am: be802d8870

Change-Id: I86b6da6177973a9654660df0b82f74b1faac68ea