Merge "Regenerate the bionic kernel headers to match external/kernel-headers."