Merge "Improve SIGILL support."
am: cf252ab07d

Change-Id: Iffcf50898022089744efe51ba45cb86f745f3029