Merge "Minor fixes and cleaning of arm64 static and direct calls code."