Add mako sensors back. They work much better.

Change-Id: If3de612d3657a9d5c452d263f5a84f0d938ad8dc