Merge "Move libmediandk and libcamera2ndk headers" am: 836c429686
am: bcb1f85c7c

Change-Id: I431894add719018b375391f27be3c224030dd6d9