Tweaked beats

I am slowly removing any fixes that overwrite one we compile.

Change-Id: I52c6cd4eb207460fd6d3394d2b45beef5f419415
Signed-off-by: DHO <DHO@dho.im>
Add Goo Rom tag to Manta

Change-Id: I5beeeccf86af107c162f6ad700a46b59461d4e45