Revert "hayabusa: fix build"

This reverts commit d0d96490cc74b84a21f10730bbff17830cd6b442

Change-Id: I9941f113181b2007448eae3b3c1cce8e061d68ee
Merge "Revert "hayabusa: fix build"" into jb-mr1