Merge "Revert "Remove remaining ndk_cruft from LP64 platforms""