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

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