Revert "build fix for aosp-idea133 @ 1119318"

Build fix is needed in AOSP, but in master it re-introduces a warning
and breaks the build on -Werror.  Revert it in master.

This reverts commit effbb3a9b72050dbe150af7302d9148fe7e927d3.
1 file changed