Merge "Revert "Remove remaining ndk_cruft from LP64 platforms""
am: 52a05f3ce7

* commit '52a05f3ce74112560c3a203965774c5c9b7faf2b':
  Revert "Remove remaining ndk_cruft from LP64 platforms"