Finishing Beats hack

Signed-off-by: Zarboz <zarboz@gmail.com>
Signed-off-by: Hieu Phan <aznrice2k4@gmail.com>
evita: enable s2w

Change-Id: I103c7c334953204bd9ddd5df91d7aa3675f990c8
Signed-off-by: Hieu Phan <aznrice2k4@gmail.com>