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

* commit '1a669df880d0bc1f4f930a56c78edeca19160ce7':
  Minor fixes and cleaning of arm64 static and direct calls code.