Merge "Move libmediandk and libcamera2ndk headers" am: 836c429686 am: bcb1f85c7c am: 15911afa63  -s ours
am: 8e84d8c7c2  -s ours

Change-Id: I5d55a356dfae7215e32a430f8c1be7cc63b69ed0