Revert "fix compile error"

This reverts commit b9eaa0d34913713964a1a23a1fd1139d9b1d35aa.

Change-Id: I834825e32073c4fbc366c03946792462407f3b7e
Merge "Revert "fix compile error"" into kk_2.7-stable