hardware/cm

Change-Id: Ie3f926d4e15d500d95adf7f1bcb7fd3efa511b20
Fix flo and mako again

Change-Id: I0ff249c68b74e5f35ced123e7025ec3fc0dc3ee4