Merge "Improve SIGILL support." am: cf252ab07d
am: 7846f38bf2

Change-Id: Ia3ffd33dec24a5d668827568216b4640cf3d984b