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

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

Change-Id: I70866ddbb67df9c205e6252364953bdd0b0f399e