Fix for vendor and also additional repos needed for cm12.

Change-Id: Iecc4c50a640922939c2002c9cad4e63e7f7c6c9b