Track more externals from CM

Change-Id: If01278800f846a5589b302a0a3c084d54bd0964d