c1905: Add missing btnvtool

Change-Id: I5dce7a6cc1356af5d8cb057883e8d6d4b7e4629d
c1905: Clean up

Change-Id: Ib2d9b87f7f6dc2cc55f8ca89059e1aa6dc0baa58