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

* commit '2649e750b6a5a846c8014b0117670f4d15b28684':
  Add the common directory back to kernel headers.