Merge "Extend cfi test to verify a range of target pointers."
am: 1ec162d392

Change-Id: Ie70bcb05b43e7a31997392adedd21fe69ef1d867