fb8df2356a
Fix duplicate keys in a couple of the onza controllers. Also, add them to the Makefile so they actually get included in the build. Bug: 8292749 Change-Id: I8246155f84d0c3c75b21e37fb579227fda76e197