-Werror,-Winfinite-recursion

Change-Id: I5485e879b30a1559127ee5f0060aa7d740fb2e7d