am 9bc462c1: Merge "Add the common directory back to kernel headers."

* commit '9bc462c12a5c4519b00e988b738c029c688c12d5':
  Add the common directory back to kernel headers.