pull in m7 variants

Change-Id: Ic7f6ba174e1cdbf77f5f972ffb5fd8626b0193a9
add tuna devices

Change-Id: I8b94be18bd62fd1d96afff74126e2c2b2479e5e3
fix this

Change-Id: I2219475f092a4c4760c009086f2af9ad7d1dec07