am df73a5fa: Merge "Performance improvement for whole static libs"

* commit 'df73a5fa0a9b44aa3a76dcf1dc7bc6606e7b367a':
  Performance improvement for whole static libs