use different USB PIDs for adb and adb+ums modes

Commit ad054c684524962eae3269c1d807dc60e8bca1ec made it so that
the same VID/PID pair was used for both adb and composite adb+ums
modes, which prevents the installation of drivers in Windows so that
either mode can be supported.

This uses the original VID/PID pair (18d1/d001) for adb+ums and
uses 18d1/d002 for adb.

Change-Id: I190c821995b7fe9e8177354aec70bd02c114d122
Merge branch 'cm-11.0' into kk_mkt