Revert "Revert "Fixed installation time regression when compile.""

Bug: 62337922

This reverts commit 54c32b1f3362129d79e512581d4932aec92425eb.

Change-Id: Ica942c9e70b63e2c4893f87c15757a519a0c4d73
1 file changed