am 05648a1d: am e551875b: Update NDK for pre-key-dispatching changes.

Merge commit '05648a1dfd948b4d74231a995b1de3d6d2eff0d1'

* commit '05648a1dfd948b4d74231a995b1de3d6d2eff0d1':
  Update NDK for pre-key-dispatching changes.