Merge changes I586e80cb,I5497f05d
am: fbb07a7993

* commit 'fbb07a799318594d0f35e343c22c14c51427af7f':
  Camera: add camera NDK API header/symbols (libcamera2ndk.so)
  Copy libmediandk symbols from android-21

Change-Id: Icb2f1b76f53d58f5d452f70f84dfe4d546aabf42