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

Change-Id: Ia87ee7c88f1003f4cfcb726e36632c5e5e24844d