Merge "Revert "Revert "Fixed installation time regression when compile."""
am: 16d59b2b0f

Change-Id: Iba0041bd09f5c9a963120a1cd9cbe69a3f6e9bf7