Merge "Add forwarding address checks for X86, arm, arm64"
am: 67381d6298

Change-Id: Ia367186c782fb59c362f5d347905f61db06b23bf