Merge "Update the scudo wrapper for bionic changes." am: 93517d1a27

Change-Id: I60f8ee282dbe8bb42ef0e87a00f5f31d1d0e58b3