Merge "Undo arm64 workaround." into mnc-dev