Merge "Fix FastNative/CriticalNative annotation lookup."
am: f6fe3cb922

Change-Id: Ic23ae7518090eaa84fa1369476fe5120519cc3b5