Merge "Adding /odm/usr -> /vendor/odm/usr symlink"
am: 03ea74aa91

Change-Id: I362472eda0545107aa805428f57b30c702a530b0