fix red eye to use the new system

Change-Id: If79106dc3144cce374afd410f5f859692e564b83
9 files changed