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

Change-Id: Ifc8c81ce4136cfbc1f2b79641b41e81e6f7cc7a2