Merge changes Ifd00d8d4,Id8db2858

* changes:
  Declare the headers of the ndk_library
  Declare the headers of the ndk_library