Merge "bionic: add clean kernel header ucontext.h"