Merge changes I586e80cb,I5497f05d am: fbb07a7993 am: f5fc7ba2b6
am: fbea1ba21c

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

Change-Id: I471d98882bb1aa0afabaa5b4898e3deb6d13ac79