libhidlbase: work w/ cfi am: 347615c729 am: b197bf21ac

Change-Id: I88d1f14b6614b1bd6cb3319a4ba8e66ddf59e4aa