Merge "<bits/glibc-syscalls.h>: only regenerate when we have new uapi headers." am: e689eb0154 am: 35c508aacf
am: 5cb354ae4a

Change-Id: I21c53f5583514a5e6e6613c9c0dfcf3eef7bd03d