am d155ba57: am c7882ab2: Merge "bionic: add clean kernel header ucontext.h"

* commit 'd155ba57a32ce3182d8a5b79ff27bc5e7fa55df9':
  bionic: add clean kernel header ucontext.h