internal build with internal/os2sd dualmode recovery tweaks

Change-Id: I487d9df501e1b4ab9d0b4870e0e6144a89acf133