Merge "Rename libcamera2.so -> libcamera2ndk.so (cherrypick)"