gbms: misc fixes for testing

No functional changes, only fix compile issues for patchwork.

Bug: 213492076
Signed-off-by: AleX Pelosi <[email protected]>
Change-Id: I08cefed28d10b0a15f9a409f675a7dc335a4121f
9 files changed