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

Change-Id: I289752996d482c7bb2634093e6f080f923c4bc3a