Merge "multinetwork API: NDK header" into mnc-dev