-Werror,-Winfinite-recursion

Change-Id: I483cd3f3a3ba87c416985fd86b9d5b711a2a18fb
-Werror,-Winfinite-recursion

Change-Id: I445302a2f51bbd244fcf7dbf2058efc30ac0b886
-Werror,-Wshadow

Change-Id: I0e9ff9efd685f17e45ada29fc2bd6134229b28c7