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

Change-Id: I01e0846f6ea1af986e6cba42ac093263b61e43b5