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

Change-Id: I2d6a99e9fa38b51dd13bed647692d665be78e2cf