Merge "Fix FastNative/CriticalNative annotation lookup."