Merge "Mount /vendor and /odm early" am: 35569e9d68
am: 46bfc918d0

Change-Id: Id18c4f3fbfb31dfd15b4fec67cbb959df358f852