Merge "Support /odm and /product in "adb remount" and "adb sync"."
am: 6eb9248cb3

Change-Id: I998a0bfa15013c763158db1cda7b06d3271caa43