Merge "/odm is another vendor partition that can be customied by ODMs" am: 5872e84f am: acc88216 am: a212c863 Change-Id: I3e18f18d49133e4fdaf1f266f905620c77eacaf8