Merge "Relax an assert in AssertPcIsWithinQuickCode()"
am: 82c6933a59

Change-Id: I0ec6d78dd8251935f0caa7dd8619587795151b3e