Merge "AImage: don't allow ~AImageReader to run before AImages are deleted." into qt-r1-dev
am: d2d66abd1a

Change-Id: Ic1051d9a84e1c60c06088f568b6be0a7f7ebfa00