fixed vendor hacks, fixed dependencies, add one more device to nightlies

Change-Id: I7b00aef611f156d302aa03f9a9584871ac675f97