Use correct vid,pid for adb+mass_storage

Change-Id: I29dc707801fafab5c03e167fbfa15312e5ca6e73
Override product name

Change-Id: Id4e6a4be2ef098a18481d0d76d8d06b7de34b8b0