bionic: some new type warnings fixes

Change-Id: I5f829e5918fb0960bb9670deac54c1fe0184550f
Merge remote-tracking branch 'cm/cm-11.0' into HEAD