With gbuildification neither was actually used anyway, as far as I
could see.

Change-Id: I00d914e6571aed3110226f91ac1685a838031c65