Merge "Handle removed classes when looking for deprecated at birth APIs." into qt-dev
am: b0815a51e9

Change-Id: I0433c0c841ee49b194acc6105d19cd4eeeb372c0