Hybrid straintronics-spintronics: Energy-efficient non-volatile devices for Boolean and non-Boolean computation