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

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

Change-Id: I51cea94b974253840d546cd2759077843dfc27a9