Merge "ndk: <sys/cdefs.h> minor update"