otter and otter2: add to cm-10.1 build targets and add amazon vendor