Merge "Make all of ndk_cruft.cpp one big extern "C"." am: 9dec0a775b
am: 36545d2e76

* commit '36545d2e7621d87f68aed620d1c99a9c0f0fbf94':
  Make all of ndk_cruft.cpp one big extern "C".