am 5a52bd34: Merge "Regenerate the bionic kernel headers to match external/kernel-headers."

* commit '5a52bd34f1b7e49e28b31dd2c186de8bdef47451':
  Regenerate the bionic kernel headers to match external/kernel-headers.