Merge changes I586e80cb,I5497f05d am: fbb07a7993
am: f5fc7ba2b6

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

Change-Id: Icac6134ba0eb69a16fa54113f721b73f2e2df01b