Merge "Performance improvement for whole static libs"