Merge "bionic: Fix wrong kernel_id in pthread descriptor after fork()"