Merge "Add private ndk ref for GPU load hints" into main