Merge "SCUDO fill options only when USE_SCUDO" am: 7591bb5ee1 am: ef9986013b

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1381396

Change-Id: I909007bab43a9d21db269f8509bb59d735d220a7