tapioca: updates and build fix

Change-Id: I002f0293fe7003e25946affe4155befa25b7c1d0