use our 8960 common tree. cm's breaks stuff... like build

Change-Id: If08d95f8cac264a07aee356d9702a8d4ddeede12