Fix hwservicemanager uses of Bn classes.
am: fcfcdfb512

Change-Id: I025cfce994f780f41ebbf8f1076b32b48d0f0369