Fix building with 4.3's bionic

Change-Id: Icbbcf959deb199e7e584642027ea0383f6450fdc
Merge remote-tracking branch 'cm/cm-10.2' into HEAD

Conflicts:
	builtins/common.c

Change-Id: Iaa30513ac18874719bf6382bf7dc4f13872ce2f9