Merge "Minor fixes and cleaning of arm64 static and direct calls code." am: a04f57badc am: 1a669df880
am: 3e6660ee03

* commit '3e6660ee03b407358636a29b8fc01fd72001bc3b':
  Minor fixes and cleaning of arm64 static and direct calls code.