Squashed commit of the following: am: 5d41fbabdb am: dea246c939

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

Change-Id: Ic2df6feab6673cf75b96cf66b069cfddbb021d70