EXT_INTRA experiment: fix shadowed declarations.

Change-Id: Ie3a29e9b23ebf5d658fad2b797d34208890f4e2a
1 file changed