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

Change-Id: I5363be34fe5a6cc481076da23ec0f9a9ca216845