Refactor code to find overlay target

Test: mm
Bug: 67779848

Change-Id: Iec654609d12e1925076ff65aafb94bf6bdf4775d
3 files changed