Fix the CFI state after an early return. Bug: 22014525 (cherry picked from commit 2738639b) Change-Id: I56b9ba8cf8c47d70a642f064e59c7e04a476dd2f