am 1f52f49c: am 3e7f4c62: Merge "ndk: <sys/cdefs.h> minor update"

* commit '1f52f49c350f68b66e929131ecd7d793e05503e1':
  ndk: <sys/cdefs.h> minor update