update mass_storage/adb vid/pid

Change-Id: I149c0602b4a31b56224bf696156a4f4ddbb2287b
add handling to keep recovery hijack alive on every boot

Change-Id: I0daf3afb4239ce381d7aa7313993b71f7e0c96c8