Bug 572075 - Make the scanner work with static and convenience libraries