Squashed commit of the following: am: 5d41fbabdb am: dea246c939 am: acf90e9498 am: 346cf7f5b8

Original change: https://android-review.googlesource.com/c/platform/external/ImageMagick/+/1676170

Change-Id: Ifbec0522226ec163099146b837070430ae992954