add support for extra CM packages and fix type in find5.removes

Change-Id: I39c1d04bceb4c84eaccb32af6ccdb9419c1e2f06