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

Change-Id: I561c0f7f406281edbc1a0a1cb60ee0ae135e7aa9