Merge "Remove references to kernel macros."
am: 0e82c84aba

Change-Id: Iec87f2ee43ca73500ebb1fda174fcb61891f1f83