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

* commit '467f8f326b979b43b6be48d5294f0627cf8fdd71':
  Performance improvement for whole static libs