Fix new compiler errors.

New clang compiler issues the following errors:
   error: a lambda parameter cannot shadow an explicitly captured entity
    note: variable 'CGF' is explicitly captured

Unlike warnings, there is no easy way to suppress this error.

Test: make checkbuild for aosp_crosshatch-userdebug
Change-Id: I1c4aadf5d045d999a95403dafe6104e8daf47d7a
1 file changed