Merge changes Ie71caf7b,I45ff708e

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