Merge "Move libmediandk and libcamera2ndk headers"