Merge "Support /odm and /product in "adb remount" and "adb sync"." into pi-dev
am: 6d2f2135ee

Change-Id: Ie78f8ff946404a24ebd499a8628b2f1d5ab3f80c