[FIX ME] These broken devices need some TLC to fix their build.

These devices will be dropped from the manifest if they're not fixed before I feel like unleashing the fury.

Change-Id: Ia7746cb6417a51075c603618c561f7b6b22ed6ee