Merge "AImageReader: make sure ~AImageReader isn't called with FrameListener::mLock held." into qt-r1-dev
am: f4a2a71f81

Change-Id: I07830bed9c52adf491989423fe6563996375126d