Merge "Revert "Revert "Remove remaining ndk_cruft from LP64 platforms"""
am: d3e5301a75

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