am 92d624ca: am 61250167: Merge "multinetwork API: NDK header" into mnc-dev

* commit '92d624ca5f5c9dfd02b054fa033d98e08013d49c':
  multinetwork API: NDK header