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

* commit '60df0c2b83f3ab3ce121e569e7779b6d4796c2d2':
  ndk: <sys/cdefs.h> minor update