Merge "media/ndk: add missing <functional> includes" into main