Merge "Remove remaining ndk_cruft from LP64 platforms"
am: b34ae08cc6

* commit 'b34ae08cc62506142c0f2407101f4914384a0d86':
  Remove remaining ndk_cruft from LP64 platforms