am c1548712: am 9e17cec2: Merge "ndk: Fixes PTHREAD_RWLOCK_INITIALIZER definition."

* commit 'c15487127a8a192ee01d3d1b676eb67ae45c38bb':
  ndk: Fixes PTHREAD_RWLOCK_INITIALIZER definition.