Merge "Support /odm and /product in "adb remount" and "adb sync"."