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

Change-Id: I6b3ee5e430ef20713325025bc50b10f5b67f6208