Merge "Support /odm partition"
am: 97debc7055

Change-Id: I4af59f5479a8d452dcbbb157334c416f18db5469