move custom stuff to local manifests

Change-Id: If999a5be47401421840a93e551b45bf0749d148b