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

Change-Id: Icb2a0362e320f988aae20f7766f2fb39b85569c6