Merge "Move to renamed NDK symbol AFileDescriptor_getFd"