Fix building with 4.3's bionic

Change-Id: Icbbcf959deb199e7e584642027ea0383f6450fdc
Merge remote-tracking branch 'cm/cm-10.2' into sm-jb-mr2