Merge "Fix bad merge in nativeDecodeFileDescriptor in BitmapFactory.cpp" into main