Update, remove duplicate, fix path some device's dependencies / .adds / .removes

Change-Id: Iaa30a7b685c0d2059961765a183b5fc24398ecce