Squashed commit of the following: am: 5d41fbabdb

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

Change-Id: I470e021f0ebb86d5105a90c7a51f4d38fbb34343