Merge "Ignore SCUDO_OPTIONS across a security boundary." am: 700f753c50

Change-Id: I9aa28632e74b94dd3b0a6154b0993dad126982fd