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

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

Change-Id: Ibce8c19142441b8931c9cf779ed11fdd2af1dfb0