hammerhead: add 3 missing libs

and a small cleanup

Change-Id: Idce63711173e9fe436db4c12b7669052171cb1b1